Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 17:15:37 +0000 (10:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 27 Apr 2011 17:15:37 +0000 (10:15 -0700)
commit909c4c4651d57e9f75fea7ab740f2ac4d343ff92
tree2e31ad0a6ece6877c97d6ddf66781ea555223758
parent5b10ac55ee08f3b7f8c2c9f81d27763d53c37cc2
parent640e5f8fa5550fe1c43d976f350254c038ef31f7
Merge from mainline.